Implement the --orig command (#4)
#88
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thanks for this! It would be really useful to have this ability to ignore conflicts, especially for people like me who manage their dotfiles with stow :-) however, I would have 2 remarks:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Implemented the simple version of the proposal for feature #4.
This should resolve simple file conflicts while stowing by moving them to an
.origcopy in the file location and then symlinking the target to the stow.Added bonus: when using
--origwith an unstow, it restores those.origfiles back, so stow + unstow should leave the host filesystem untouched. This has no effect on unstow file conflicts.I didn't need the flexibility of supplying the extension as another arg, or copying the backups to a different dir (as described in a further comment), but I'll be happy to implement if that feature has more demand!